Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 31 Aug 2011 20:02:51 +0000 (13:02 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 31 Aug 2011 20:02:51 +0000 (13:02 -0700)
commitb14908bf9d489b41b398b9dc22807d01a1ffa03f
tree3116261f1a339c7a28e43dfecbfd55b78ba72a52
parent6e380a299dcef322446e219eb9cf3c8d0e4f1334
parent7c3e9699fa16e38e015c858096f963b37e9ac28e
Merge from trunk.
src/ChangeLog